Fixed directory name to create for the application.

Defined mutex (and create in utils.pas) to tell "Setup" that we are running.
Replaced several locations of version and release with const definitions.
Changed basename for setup package to iGPSBabel-{#Version}{#Release}.

diff --git a/gpsbabel/win32/gui-2/gpsbabel.iss b/gpsbabel/win32/gui-2/gpsbabel.iss
index 77ee725e379dd6063db3b81f594f7e8a7125ffc8..8de7c060153b707a315340b30e0ab0758589fd73 100644 (file)
--- a/gpsbabel/win32/gui-2/gpsbabel.iss
+++ b/gpsbabel/win32/gui-2/gpsbabel.iss
@@ -1,11 +1,14 @@
 ; Script generated by the Inno Setup Script Wizard.\r
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!\r
 \r
+#define Version "1.2.8"\r
+#define Release "-beta12012005"\r
+\r
 [Setup]\r
 AppName=GPSBabel\r
-AppVerName=GPSBabel-1.2.8-beta12012005\r
+AppVerName=GPSBabel-{#Version}{#Release}\r
 RestartIfNeededByRun=false\r
-DefaultDirName={pf}\GPSBabel-1.2.8\r
+DefaultDirName={pf}\GPSBabel-{#Version}\r
 ShowLanguageDialog=auto\r
 OutputDir=C:\TEMP\r
 SourceDir=.\\r
@@ -13,7 +16,7 @@ DefaultGroupName=GPSBabel
 AlwaysUsePersonalGroup=true\r
 UserInfoPage=false\r
 EnableDirDoesntExistWarning=true\r
-VersionInfoVersion=1.2.8\r
+VersionInfoVersion={#Version}\r
 VersionInfoCompany=GPSBabel makers\r
 AllowRootDirectory=true\r
 AlwaysShowGroupOnReadyPage=true\r
@@ -21,21 +24,26 @@ InternalCompressLevel=fast
 WindowVisible=false\r
 SetupIconFile=GPSBabelGUI.ico\r
 DisableFinishedPage=false\r
-AppVersion=1.2.8-beta12012005\r
+AppVersion={#Version}{#Release}\r
 UninstallDisplayIcon={app}\GPSBabelGUI.exe\r
-UninstallDisplayName=GPSBabel 1.2.8\r
+UninstallDisplayName=GPSBabel {#Version}\r
 AppPublisherURL=http://www.gpsbabel.org\r
 AppUpdatesURL=http://sourceforge.net/project/showfiles.php?group_id=58972\r
 DisableStartupPrompt=true\r
 AppID={{E25E9E85-2244-4AB0-B00D-7F44C6E9F635}\r
+AppMutex=GPSBabelGUI_mutex\r
+OutputBaseFilename=iGPSBabel-{#Version}{#Release}\r
+\r
+[Tasks]\r
+Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked\r
+Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked\r
 \r
 [Files]\r
 Source: GPSBabelGUI.exe; DestDir: {app}; Flags: replacesameversion\r
+Source: README.gui; DestDir: {app}\r
 Source: ..\..\mingw\libexpat.dll; DestDir: {app}\r
 Source: ..\..\mingw\gpsbabel.exe; DestDir: {app}; Flags: comparetimestamp ignoreversion; Languages: \r
-Source: README; DestDir: {app}\r
-Source: README.gui; DestDir: {app}\r
-Source: ..\..\README.xmapwpt; DestDir: {app}\r
+Source: ..\..\README; DestDir: {app}\r
 Source: ..\..\COPYING; DestDir: {app}\r
 Source: ..\..\README.contrib; DestDir: {app}\r
 Source: ..\..\README.igc; DestDir: {app}\r
@@ -43,18 +51,24 @@ Source: ..\..\README.magnav; DestDir: {app}
 Source: ..\..\README.mapconverter; DestDir: {app}\r
 Source: ..\..\README.psp; DestDir: {app}\r
 Source: ..\..\AUTHORS; DestDir: {app}\r
+\r
 [Dirs]\r
-Name: {pf}\GPSBabel\r
+Name: {app}\r
+\r
 [Languages]\r
 Name: en; MessagesFile: compiler:Default.isl\r
 Name: de; MessagesFile: compiler:Languages\German.isl\r
 Name: fr; MessagesFile: compiler:Languages\French.isl\r
+\r
 [Icons]\r
 Name: {group}\GPSBabelGUI; Filename: {app}\GPSBabelGUI.exe; WorkingDir: {app}; IconFilename: {app}\GPSBabelGUI.exe; IconIndex: 0; Flags: useapppaths\r
 Name: {group}\{cm:UninstallProgram, GPSBabel}; Filename: {uninstallexe}\r
-Name: {userdesktop}\GPSBabelGUI; Filename: {app}\GPSBabelGUI.exe; IconIndex: 0; Tasks: \r
+Name: {userdesktop}\GPSBabelGUI; Filename: {app}\GPSBabelGUI.exe; WorkingDir: {app}; Tasks: desktopicon; IconIndex: 0\r
+Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Medical Archive; Filename: {app}\GPSBabelGUI.exe; Tasks: quicklaunchicon; WorkingDir: {app}; IconFilename: {app}\GPSBabelGUI.exe; IconIndex: 0\r
+\r
 [Run]\r
-Filename: {app}\GPSBabelGUI.exe; WorkingDir: {app}; Flags: postinstall unchecked\r
+Filename: {app}\GPSBabelGUI.exe; WorkingDir: {app}; Flags: postinstall unchecked skipifsilent; Description: {cm:LaunchProgram,GPSBabelBUI}\r
+\r
 [Code]\r
 var\r
   GPSBabelPathRead: Boolean;\r
@@ -101,4 +115,3 @@ begin
     end;\r
   end;\r
 end;\r
-\r

diff --git a/gpsbabel/win32/gui-2/utils.pas b/gpsbabel/win32/gui-2/utils.pas
index 9453183224a43bc240ea7ae91b54c1a5411e39eb..62b491dc318c79c65dcd89cc0d6c29d481417967 100644 (file)
--- a/gpsbabel/win32/gui-2/utils.pas
+++ b/gpsbabel/win32/gui-2/utils.pas
@@ -305,4 +305,17 @@ begin
 // !!! TRICK !!!\r
 end;\r
 \r
+var\r
+  hMutex: THandle;\r
+  \r
+initialization\r
+\r
+  // Flag for InnoSetup\r
+  hMutex := CreateMutex(nil, True, 'GPSBabelGUI_mutex');\r
+\r
+finalization\r
+\r
+  if (hMutex <> 0) then\r
+    CloseHandle(hMutex);\r
+\r
 end.\r